[GtkStyle] Remove deprecated GdkFont usage

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 9791f677fff0c2ab46fe0f1a65a24791d262173e..5785081c19048f7fdc32c086c5ed46a3a5563e93 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -631,9 +631,6 @@ gtk_style_finalize (GObject *object)
   g_slist_free (priv->color_hashes);
 
   pango_font_description_free (style->font_desc);
-  
-  if (style->private_font)
-    gdk_font_unref (style->private_font);
 
   if (style->private_font_desc)
     pango_font_description_free (style->private_font_desc);
@@ -772,12 +769,6 @@ gtk_style_attach (GtkStyle  *style,
   if (!new_style)
     {
       new_style = gtk_style_duplicate (style);
-      if (gdk_colormap_get_screen (style->colormap) != gdk_colormap_get_screen (colormap) &&
-         new_style->private_font)
-       {
-         gdk_font_unref (new_style->private_font);
-         new_style->private_font = NULL;
-       }
       gtk_style_realize (new_style, colormap);
     }
 
@@ -821,12 +812,6 @@ gtk_style_detach (GtkStyle *style)
 
       if (style->private_font_desc)
        {
-         if (style->private_font)
-           {
-             gdk_font_unref (style->private_font);
-             style->private_font = NULL;
-           }
-         
          pango_font_description_free (style->private_font_desc);
          style->private_font_desc = NULL;
        }
@@ -975,12 +960,6 @@ gtk_style_real_copy (GtkStyle *style,
        g_object_ref (style->bg_pixmap[i]);
     }
 
-  if (style->private_font)
-    gdk_font_unref (style->private_font);
-  style->private_font = src->private_font;
-  if (style->private_font)
-    gdk_font_ref (style->private_font);
-
   if (style->font_desc)
     pango_font_description_free (style->font_desc);
   if (src->font_desc)

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 93feed62434e0f23b6bd63b271b659d9f540745f..3a09e9712eda7e4a6aab1765d3735d4f2ef8e96a 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -117,7 +117,6 @@ struct _GtkStyle
 
   gint depth;
   GdkColormap *colormap;
-  GdkFont *private_font;
   PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
 
   /* the RcStyle from which this style was created */